9a4a241d0265999fa3521903210ac6f6ed126aa7,portal-ejb/src/com/liferay/portal/service/impl/LayoutLocalServiceImpl.java,LayoutLocalServiceImpl,importLayouts,#String#String#File#,438

Before Change


				portlet.getPortletDataHandler();

			if (portletDataHandler != null) {
				portletDataHandler.importData(
					layoutSet.getCompanyId(), layoutSet.getGroupId(), data);
			}
		}

After Change


                        try {
                            PortletPreferencesImpl prefsImpl = (PortletPreferencesImpl)PortletPreferencesSerializer.fromDefaultXML(preferences);
                            
                            prefsImpl = (PortletPreferencesImpl)portletDataHandler.importData(
                                layoutSet.getCompanyId(), 
                                layoutSet.getGroupId(),
                                portletId,
                                prefsImpl,
                                portletData.getText());
                            if (prefsImpl != null) {
                                prefs.setPreferences(PortletPreferencesSerializer.toXML(prefsImpl));
                            }